From: Glenn Morris <rgm@gnu.org>
Date: Wed, 23 Feb 2011 04:21:48 +0000 (-0800)
Subject: Remove bogus duplicate ChangeLog entry from r100497.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~14
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=690e44bf5502b77719214235ca5500a760f3a8c5;p=emacs.git

Remove bogus duplicate ChangeLog entry from r100497.
No need to merge this to trunk.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b1b084b0bad..772647dfe90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,12 +8,6 @@
 
 	* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
 
-2011-02-17  Kenichi Handa  <handa@m17n.org>
-
-	* font.c (font_open_entity): Be sure to set scaled_pixel_size.
-	(font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
-	integer.
-
 2011-02-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (redisplay_internal): Resynchronize `w' if the selected